Use a single OK button, not a Close button, as per the HIG.

2004-03-11  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkfilechooserdefault.c (error_message_with_parent): Use a
	single OK button, not a Close button, as per the HIG.

	* gtk/gtkfilesel.c (gtk_file_selection_fileop_error): Likewise.

diff --git a/ChangeLog b/ChangeLog
index ded80d4fc286137f920bd2b95eae8de8e81c5bda..8d43a5eef439ff50ca076e9a7ebc8760f13c8b7a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-11  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (error_message_with_parent): Use a
+       single OK button, not a Close button, as per the HIG.
+
+       * gtk/gtkfilesel.c (gtk_file_selection_fileop_error): Likewise.
+
 2004-03-11  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ded80d4fc286137f920bd2b95eae8de8e81c5bda..8d43a5eef439ff50ca076e9a7ebc8760f13c8b7a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-03-11  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (error_message_with_parent): Use a
+       single OK button, not a Close button, as per the HIG.
+
+       * gtk/gtkfilesel.c (gtk_file_selection_fileop_error): Likewise.
+
 2004-03-11  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ded80d4fc286137f920bd2b95eae8de8e81c5bda..8d43a5eef439ff50ca076e9a7ebc8760f13c8b7a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2004-03-11  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (error_message_with_parent): Use a
+       single OK button, not a Close button, as per the HIG.
+
+       * gtk/gtkfilesel.c (gtk_file_selection_fileop_error): Likewise.
+
 2004-03-11  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ded80d4fc286137f920bd2b95eae8de8e81c5bda..8d43a5eef439ff50ca076e9a7ebc8760f13c8b7a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-03-11  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (error_message_with_parent): Use a
+       single OK button, not a Close button, as per the HIG.
+
+       * gtk/gtkfilesel.c (gtk_file_selection_fileop_error): Likewise.
+
 2004-03-11  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ded80d4fc286137f920bd2b95eae8de8e81c5bda..8d43a5eef439ff50ca076e9a7ebc8760f13c8b7a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-03-11  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (error_message_with_parent): Use a
+       single OK button, not a Close button, as per the HIG.
+
+       * gtk/gtkfilesel.c (gtk_file_selection_fileop_error): Likewise.
+
 2004-03-11  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 72ce62c5487fa40445d01397d59731d2987b28c7..c7d9d7e12ab9e92b08341cbdd2d03b4ca40bbdd5 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -633,7 +633,7 @@ error_message_with_parent (GtkWindow  *parent,
   dialog = gtk_message_dialog_new (parent,
                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                   GTK_MESSAGE_ERROR,
-                                  GTK_BUTTONS_CLOSE,
+                                  GTK_BUTTONS_OK,
                                   "%s",
                                   msg);
   gtk_dialog_run (GTK_DIALOG (dialog));

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 805d937debd2e6d1d352c7b6d18dfb3815cceb66..86bdf3fecc5ee4e23a29998b513468ea45b6a429 100644 (file)
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -1371,7 +1371,7 @@ gtk_file_selection_fileop_error (GtkFileSelection *fs,
   dialog = gtk_message_dialog_new (GTK_WINDOW (fs),
                                   GTK_DIALOG_DESTROY_WITH_PARENT,
                                   GTK_MESSAGE_ERROR,
-                                  GTK_BUTTONS_CLOSE,
+                                  GTK_BUTTONS_OK,
                                   "%s", error_message);
 
   /* yes, we free it */